Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 28 Nov 2005 17:22:02 +0000 (17:22 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 28 Nov 2005 17:22:02 +0000 (17:22 +0000)

Trivial merge